From d27fbb006132147f73795ca4ad60a0e38b050b58 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 9 Mar 2006 22:31:45 +0100 Subject: [PATCH] Move 'debug' build option into the outermost Config.mk file. Signed-off-by: Keir Fraser --- Config.mk | 11 +++++++++++ tools/blktap/Makefile | 2 -- tools/blktap/parallax/Makefile | 2 -- tools/blktap/ublkback/Makefile | 2 -- tools/console/testsuite/Makefile | 5 +++-- tools/debugger/libxendebug/Makefile | 4 +--- tools/firmware/acpi/Makefile | 21 ++++++++++----------- tools/ioemu/Makefile | 2 +- tools/ioemu/configure | 22 +++++++++++----------- tools/ioemu/target-i386-dm/Makefile | 3 +-- tools/libxc/Makefile | 3 --- tools/misc/Makefile | 2 +- tools/misc/cpuperf/Makefile | 2 -- tools/misc/lomount/Makefile | 2 +- tools/misc/mbootpack/Makefile | 4 +--- tools/security/Makefile | 1 - tools/vnet/libxutil/Makefile | 2 +- tools/vnet/vnetd/Makefile | 2 -- tools/xcutils/Makefile | 2 +- tools/xenstore/Makefile | 2 +- tools/xentrace/Makefile | 2 +- xen/Rules.mk | 8 +------- xen/arch/x86/Rules.mk | 4 ---- 23 files changed, 46 insertions(+), 64 deletions(-) diff --git a/Config.mk b/Config.mk index 180f932fc1..a7c975d2bc 100644 --- a/Config.mk +++ b/Config.mk @@ -1,5 +1,8 @@ # -*- mode: Makefile; -*- +# A debug build of Xen and tools? +debug ?= n + # Currently supported architectures: x86_32, x86_64 XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH) @@ -9,6 +12,14 @@ XEN_TARGET_X86_PAE ?= n HOSTCC = gcc HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer +ifneq ($(debug),y) +# Optimisation flags are overridable +CFLAGS ?= -O3 -fomit-frame-pointer +CFLAGS += -DNDEBUG +else +CFLAGS += -g +endif + AS = $(CROSS_COMPILE)as LD = $(CROSS_COMPILE)ld CC = $(CROSS_COMPILE)gcc diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile index 6f19e79f3f..d4019c0252 100644 --- a/tools/blktap/Makefile +++ b/tools/blktap/Makefile @@ -24,8 +24,6 @@ SRCS += blktaplib.c xenbus.c blkif.c CFLAGS += -Werror CFLAGS += -Wno-unused -#CFLAGS += -O3 -CFLAGS += -g3 CFLAGS += -fno-strict-aliasing CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE # get asprintf(): diff --git a/tools/blktap/parallax/Makefile b/tools/blktap/parallax/Makefile index d2cc0ee624..a6a0c0a3f8 100644 --- a/tools/blktap/parallax/Makefile +++ b/tools/blktap/parallax/Makefile @@ -33,8 +33,6 @@ VDI_TOOLS += vdi_validate CFLAGS += -Werror CFLAGS += -Wno-unused -#CFLAGS += -O3 -CFLAGS += -g3 CFLAGS += -fno-strict-aliasing CFLAGS += $(INCLUDES) CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE diff --git a/tools/blktap/ublkback/Makefile b/tools/blktap/ublkback/Makefile index d6083478e9..6915d2f523 100644 --- a/tools/blktap/ublkback/Makefile +++ b/tools/blktap/ublkback/Makefile @@ -11,8 +11,6 @@ INSTALL_DIR = /usr/sbin CFLAGS += -Werror CFLAGS += -Wno-unused -#CFLAGS += -O3 -CFLAGS += -g3 CFLAGS += -fno-strict-aliasing CFLAGS += -I $(XEN_LIBXC) CFLAGS += $(INCLUDES) -I. diff --git a/tools/console/testsuite/Makefile b/tools/console/testsuite/Makefile index 33ae3c1618..2deb7d43d6 100644 --- a/tools/console/testsuite/Makefile +++ b/tools/console/testsuite/Makefile @@ -1,5 +1,6 @@ -CFLAGS=-g -Wall -CC=gcc +XEN_ROOT = ../../.. +include $(XEN_ROOT)/tools/Rules.mk + LDFLAGS=-static all: console-dom0 console-domU procpipe diff --git a/tools/debugger/libxendebug/Makefile b/tools/debugger/libxendebug/Makefile index 1708802116..d0a90e1267 100644 --- a/tools/debugger/libxendebug/Makefile +++ b/tools/debugger/libxendebug/Makefile @@ -7,14 +7,12 @@ INSTALL_DIR = $(INSTALL) -d -m0755 MAJOR = 3.0 MINOR = 0 -CC = gcc - XEN_ROOT = ../../.. include $(XEN_ROOT)/tools/Rules.mk SRCS := xendebug.c -CFLAGS += -Werror -O3 -fno-strict-aliasing +CFLAGS += -Werror -fno-strict-aliasing CFLAGS += $(INCLUDES) -I. -I$(XEN_ROOT)/tools/libxc # Get gcc to generate the dependencies for us. CFLAGS += -Wp,-MD,.$(@F).d diff --git a/tools/firmware/acpi/Makefile b/tools/firmware/acpi/Makefile index 29b7f4dd5b..26d932fbea 100644 --- a/tools/firmware/acpi/Makefile +++ b/tools/firmware/acpi/Makefile @@ -16,11 +16,12 @@ # * # */ # + +XEN_ROOT = ../../.. +include $(XEN_ROOT)/tools/Rules.mk + # Compiler flag -CFLAG=-I. -I../../libxc - -# Compiler tool -CC=gcc +HOSTCFLAGS += -I. -I../../libxc # TARGET C_SRC=$(shell ls *.c) @@ -33,7 +34,7 @@ IASL_URL=http://developer.intel.com/technology/iapc/acpi/downloads/$(IASL_VER).t vpath iasl $(PATH) all:$(ACPI_BIN) - + acpi_dsdt.c:acpi_dsdt.asl $(MAKE) iasl iasl -oa -tc acpi_dsdt.asl @@ -54,15 +55,13 @@ iasl: install $(IASL_VER)/compiler/iasl /usr/bin/iasl $(ACPI_GEN):$(C_SRC) $(H_SRC) acpi_dsdt.c - $(CC) -o $(ACPI_GEN) $(CFLAG) $(shell ls *.c) + $(HOSTCC) -o $(ACPI_GEN) $(HOSTCFLAGS) $(shell ls *.c) $(ACPI_BIN):$(ACPI_GEN) ./$(ACPI_GEN) $(ACPI_BIN) - + clean: rm -rf *.o $(ACPI_GEN) $(ACPI_BIN) $(IASL_VER) -# rm -f acpi_dsdt.c rm -rf $(IASL_VER).tar.gz -install:all - - + +install: all diff --git a/tools/ioemu/Makefile b/tools/ioemu/Makefile index bf3deef77b..09c69c77ec 100644 --- a/tools/ioemu/Makefile +++ b/tools/ioemu/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk -include config-host.mak -CFLAGS+=-O2 -g -fno-strict-aliasing +CFLAGS+=-g -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif diff --git a/tools/ioemu/configure b/tools/ioemu/configure index c50ce360b6..89e7d0d762 100755 --- a/tools/ioemu/configure +++ b/tools/ioemu/configure @@ -392,17 +392,17 @@ echo "docdir=$docdir" >> $config_mak echo "configdir=$configdir" >> $config_mak echo "LIBDIR=$libdir" >> $config_mak echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h -echo "MAKE=$make" >> $config_mak -echo "CC=$cc" >> $config_mak -if test "$have_gcc3_options" = "yes" ; then - echo "HAVE_GCC3_OPTIONS=yes" >> $config_mak -fi -echo "HOST_CC=$host_cc" >> $config_mak -echo "AR=$ar" >> $config_mak -echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak -echo "CFLAGS=$CFLAGS" >> $config_mak -echo "LDFLAGS=$LDFLAGS" >> $config_mak -echo "EXESUF=$EXESUF" >> $config_mak +#echo "MAKE=$make" >> $config_mak +#echo "CC=$cc" >> $config_mak +#if test "$have_gcc3_options" = "yes" ; then +# echo "HAVE_GCC3_OPTIONS=yes" >> $config_mak +#fi +#echo "HOST_CC=$host_cc" >> $config_mak +#echo "AR=$ar" >> $config_mak +#echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak +#echo "CFLAGS=$CFLAGS" >> $config_mak +#echo "LDFLAGS=$LDFLAGS" >> $config_mak +#echo "EXESUF=$EXESUF" >> $config_mak if test "$bigendian" = "yes" ; then echo "WORDS_BIGENDIAN=yes" >> $config_mak diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile index 40f68a10f6..3400621cef 100644 --- a/tools/ioemu/target-i386-dm/Makefile +++ b/tools/ioemu/target-i386-dm/Makefile @@ -13,7 +13,7 @@ ifdef CONFIG_USER_ONLY VPATH+=:$(SRC_PATH)/linux-user DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS+=-O2 -g -fno-strict-aliasing +CFLAGS+=-g -fno-strict-aliasing LDFLAGS=-g LIBS= HELPER_CFLAGS=$(CFLAGS) @@ -99,7 +99,6 @@ LDFLAGS+=-static endif ifeq ($(ARCH),i386) -CFLAGS+=-fomit-frame-pointer OP_CFLAGS=$(CFLAGS) -mpreferred-stack-boundary=2 ifeq ($(HAVE_GCC3_OPTIONS),yes) OP_CFLAGS+= -falign-functions=0 -fno-gcse diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 3ec4c05d4e..67cdf207f1 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -7,8 +7,6 @@ INSTALL_DIR = $(INSTALL) -d -m0755 MAJOR = 3.0 MINOR = 0 -CC = gcc - XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk @@ -49,7 +47,6 @@ BUILD_SRCS += xc_hvm_build.c endif CFLAGS += -Werror -CFLAGS += -O3 CFLAGS += -fno-strict-aliasing CFLAGS += $(INCLUDES) -I. diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 70f8e9c675..003947c8e3 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -5,7 +5,7 @@ INSTALL_DIR = $(INSTALL) -d -m0755 XEN_ROOT=../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Werror -O3 +CFLAGS += -Werror INCLUDES += -I $(XEN_XC) INCLUDES += -I $(XEN_LIBXC) diff --git a/tools/misc/cpuperf/Makefile b/tools/misc/cpuperf/Makefile index 86b9c185fe..185660efcb 100644 --- a/tools/misc/cpuperf/Makefile +++ b/tools/misc/cpuperf/Makefile @@ -17,8 +17,6 @@ INSTALL_DIR = $(INSTALL) -d -m0755 XEN_ROOT=../../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -O3 - HDRS = $(wildcard *.h) SRCS = $(wildcard *.c) OBJS = $(patsubst %.c,%.o,$(SRCS)) diff --git a/tools/misc/lomount/Makefile b/tools/misc/lomount/Makefile index eed0c66951..1a47c0b45f 100644 --- a/tools/misc/lomount/Makefile +++ b/tools/misc/lomount/Makefile @@ -6,7 +6,7 @@ INSTALL_DATA = $(INSTALL) -m0644 XEN_ROOT=../../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Werror -O3 +CFLAGS += -Werror HDRS = $(wildcard *.h) OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) diff --git a/tools/misc/mbootpack/Makefile b/tools/misc/mbootpack/Makefile index d87aa8a838..3c6791e4ee 100644 --- a/tools/misc/mbootpack/Makefile +++ b/tools/misc/mbootpack/Makefile @@ -21,9 +21,7 @@ INCS := -I. -I- DEFS := LDFLAGS := CFLAGS += -Wpointer-arith -Wcast-qual -Wno-unused -Wno-format -CFLAGS += -Wmissing-prototypes -#CFLAGS += -pipe -g -O0 -Wcast-align -CFLAGS += -pipe -O3 +CFLAGS += -Wmissing-prototypes -pipe # What object files need building for the program OBJS := mbootpack.o buildimage.o diff --git a/tools/security/Makefile b/tools/security/Makefile index ea12a81147..75646c6f46 100644 --- a/tools/security/Makefile +++ b/tools/security/Makefile @@ -2,7 +2,6 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror -CFLAGS += -O3 CFLAGS += -fno-strict-aliasing CFLAGS += -I. diff --git a/tools/vnet/libxutil/Makefile b/tools/vnet/libxutil/Makefile index f6a5ca0780..8ace83e554 100644 --- a/tools/vnet/libxutil/Makefile +++ b/tools/vnet/libxutil/Makefile @@ -29,7 +29,7 @@ LIB_SRCS += util.c LIB_OBJS := $(LIB_SRCS:.c=.o) PIC_OBJS := $(LIB_SRCS:.c=.opic) -CFLAGS += -Werror -O3 -fno-strict-aliasing -g +CFLAGS += -Werror -fno-strict-aliasing # Get gcc to generate the dependencies for us. CFLAGS += -Wp,-MD,.$(@F).d diff --git a/tools/vnet/vnetd/Makefile b/tools/vnet/vnetd/Makefile index 93482fa419..74a3d07b40 100644 --- a/tools/vnet/vnetd/Makefile +++ b/tools/vnet/vnetd/Makefile @@ -42,8 +42,6 @@ CPPFLAGS += -D USE_GC CPPFLAGS += -D __ARCH_I386_ATOMIC__ #---------------------------------------------------------------------------- -CFLAGS += -g -CFLAGS += -O2 CFLAGS += $(INCLUDES) $(LIBS) LDFLAGS += $(LIBS) diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index 5bf5f3d68a..9907dfa0c5 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -19,7 +19,7 @@ PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin INCLUDES += -I $(XEN_LIBXC) -CFLAGS += -Werror -O3 -fno-strict-aliasing +CFLAGS += -Werror -fno-strict-aliasing CFLAGS += $(INCLUDES) # Make gcc generate dependencies. diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index a024be0ae9..70877eff8a 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -12,7 +12,7 @@ BASECFLAGS=-Wall -g -Werror # Make gcc generate dependencies. BASECFLAGS += -Wp,-MD,.$(@F).d PROG_DEP = .*.d -BASECFLAGS+= -O3 $(PROFILE) +BASECFLAGS+= $(PROFILE) #BASECFLAGS+= -I$(XEN_ROOT)/tools BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc BASECFLAGS+= -I. diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 8179695fb5..1d66129c8d 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -6,7 +6,7 @@ INSTALL_DATA = $(INSTALL) -m0644 XEN_ROOT=../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Werror -O3 +CFLAGS += -Werror CFLAGS += -I $(XEN_XC) CFLAGS += -I $(XEN_LIBXC) diff --git a/xen/Rules.mk b/xen/Rules.mk index 8fbae5270f..2ece51a889 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -4,7 +4,6 @@ # 'make clean' before rebuilding. # verbose ?= n -debug ?= n perfc ?= n perfc_arrays?= n crash_debug ?= n @@ -47,12 +46,7 @@ include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk CFLAGS += -g -D__XEN__ -ifneq ($(debug),y) -CFLAGS += -DNDEBUG -ifeq ($(verbose),y) -CFLAGS += -DVERBOSE -endif -else +ifneq ($(debug)$(verbose),nn) CFLAGS += -DVERBOSE endif diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 0cf48cd5da..66cddd1577 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -14,10 +14,6 @@ CFLAGS += -I$(BASEDIR)/include CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default -ifneq ($(debug),y) -CFLAGS += -O3 -fomit-frame-pointer -endif - # Prevent floating-point variables from creeping into Xen. CFLAGS += -msoft-float -- 2.30.2